# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.676.14.1 -> 1.676.14.2 # drivers/char/agp/agpgart_be.c 1.36 -> 1.37 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/09/27 bjorn_helgaas@hp.com 1.676.14.2 # Fix max AGP memory for machines with discontiguous memory. # -------------------------------------------- # diff -Nru a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c --- a/drivers/char/agp/agpgart_be.c Wed Oct 8 09:07:05 2003 +++ b/drivers/char/agp/agpgart_be.c Wed Oct 8 09:07:05 2003 @@ -5000,7 +5000,7 @@ { long memory, index, result; - memory = virt_to_phys(high_memory) >> 20; + memory = (num_physpages << PAGE_SHIFT) >> 20; index = 1; while ((memory > maxes_table[index].mem) &&